diff --git a/KBPopUpToolbarItem.h b/KBPopUpToolbarItem.h
deleted file mode 100644
index 7a4096b..0000000
--- a/KBPopUpToolbarItem.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  KBPopUpToolbarItem.h
-//  --------------------
-//
-//  Created by Keith Blount on 14/05/2006.
-//  Copyright 2006 Keith Blount. All rights reserved.
-//
-//	Provides a toolbar item that performs its given action if clicked, or displays a pop-up menu
-//	(if it has one) if held down for over half a second.
-//
-
-#import <Cocoa/Cocoa.h>
-@class KBDelayedPopUpButton;
-
-
-@interface KBPopUpToolbarItem : NSToolbarItem
-{
-	KBDelayedPopUpButton *button;
-	NSImage *smallImage;
-	NSImage *regularImage;
-}
-- (void)setMenu:(NSMenu *)menu;
-- (NSMenu *)menu;
-@end
diff --git a/KBPopUpToolbarItem.m b/KBPopUpToolbarItem.m
deleted file mode 100644
index 0ca7711..0000000
--- a/KBPopUpToolbarItem.m
+++ /dev/null
@@ -1,280 +0,0 @@
-//
-//  KBPopUpToolbarItem.m
-//  --------------------
-//
-//  Created by Keith Blount on 14/05/2006.
-//  Copyright 2006 Keith Blount. All rights reserved.
-//
-
-#import "KBPopUpToolbarItem.h"
-
-@interface KBDelayedPopUpButtonCell : NSButtonCell
-@end
-
-@implementation KBDelayedPopUpButtonCell
-
-- (NSPoint)menuPositionForFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
-	NSPoint result = [controlView convertPoint:cellFrame.origin toView:nil];
-	result.x += 1.0;
-	result.y -= cellFrame.size.height + 5.5;
-	return result;
-}
-
-- (void)showMenuForEvent:(NSEvent *)theEvent controlView:(NSView *)controlView cellFrame:(NSRect)cellFrame
-{
-	NSPoint menuPosition = [self menuPositionForFrame:cellFrame inView:controlView];
-	
-	// Create event for pop up menu with adjusted mouse position
-	NSEvent *menuEvent = [NSEvent mouseEventWithType:[theEvent type]
-											location:menuPosition
-									   modifierFlags:[theEvent modifierFlags]
-										   timestamp:[theEvent timestamp]
-										windowNumber:[theEvent windowNumber]
-											 context:[theEvent context]
-										 eventNumber:[theEvent eventNumber]
-										  clickCount:[theEvent clickCount]
-											pressure:[theEvent pressure]];
-	
-	[NSMenu popUpContextMenu:[self menu] withEvent:menuEvent forView:controlView];
-}
-
-- (BOOL)trackMouse:(NSEvent *)theEvent inRect:(NSRect)cellFrame ofView:(NSView *)controlView untilMouseUp:(BOOL)untilMouseUp
-{
-	
-	BOOL result = NO;
-	NSDate *endDate;
-	NSPoint currentPoint = [theEvent locationInWindow];
-	BOOL done = NO;
-	BOOL trackContinously = [self startTrackingAt:currentPoint inView:controlView];
-	
-	// Catch next mouse-dragged or mouse-up event until timeout
-	BOOL mouseIsUp = NO;
-	NSEvent *event;
-	while (!done)
-	{
-		NSPoint lastPoint = currentPoint;
-		
-		// Set up timer for pop-up menu if we have one
-		if ([self menu])
-			endDate = [NSDate dateWithTimeIntervalSinceNow:0.6];
-		else
-			endDate = [NSDate distantFuture];
-		
-		event = [NSApp nextEventMatchingMask:(NSLeftMouseUpMask|NSLeftMouseDraggedMask)
-								   untilDate:endDate
-									  inMode:NSEventTrackingRunLoopMode
-									 dequeue:YES];
-		
-		if (event)	// Mouse event
-		{
-			currentPoint = [event locationInWindow];
-			
-			// Send continueTracking.../stopTracking...
-			if (trackContinously)
-			{
-				if (![self continueTracking:lastPoint at:currentPoint inView:controlView])
-				{
-					done = YES;
-					[self stopTracking:lastPoint at:currentPoint inView:controlView mouseIsUp:mouseIsUp];
-				}
-				if ([self isContinuous])
-				{
-					[NSApp sendAction:[self action] to:[self target] from:controlView];
-				}
-			}
-			
-			mouseIsUp = ([event type] == NSLeftMouseUp);
-			done = done || mouseIsUp;
-			
-			if (untilMouseUp)
-			{
-				result = mouseIsUp;
-			}
-			else
-			{
-				// Check if the mouse left our cell rect
-				result = NSPointInRect([controlView convertPoint:currentPoint fromView:nil], cellFrame);
-				if (!result)
-					done = YES;
-			}
-			
-			if (done && result && ![self isContinuous])
-				[NSApp sendAction:[self action] to:[self target] from:controlView];
-		
-		}
-		else	// Show menu
-		{
-			done = YES;
-			result = YES;
-			[self showMenuForEvent:theEvent controlView:controlView cellFrame:cellFrame];
-		}
-	}
-	return result;
-}
-
-@end
-
-@interface KBDelayedPopUpButton : NSButton
-@end
-
-@implementation KBDelayedPopUpButton
-
-- (id)initWithFrame:(NSRect)frameRect
-{
-	if (self = [super initWithFrame:frameRect])
-	{
-		if (![[self cell] isKindOfClass:[KBDelayedPopUpButtonCell class]])
-		{
-			NSString *title = [self title];
-			if (title == nil) title = @"";			
-			[self setCell:[[[KBDelayedPopUpButtonCell alloc] initTextCell:title] autorelease]];
-			[[self cell] setControlSize:NSRegularControlSize];
-		}
-	}
-	return self;
-}
-
-@end
-
-
-@implementation KBPopUpToolbarItem
-
-- (id)initWithItemIdentifier:(NSString *)ident
-{
-	if (self = [super initWithItemIdentifier:ident])
-	{
-		button = [[KBDelayedPopUpButton alloc] initWithFrame:NSMakeRect(0,0,32,32)];
-		[button setButtonType:NSMomentaryChangeButton];
-		[button setBordered:NO];
-		[self setView:button];
-		[self setMinSize:NSMakeSize(32,32)];
-		[self setMaxSize:NSMakeSize(32,32)];
-	}
-	return self;
-}
-
-// Note that we make no assumptions about the retain/release of the toolbar item's view, just to be sure -
-// we therefore retain our button view until we are dealloc'd.
-- (void)dealloc
-{
-	[button release];
-	[regularImage release];
-	[smallImage release];
-	[super dealloc];
-}
-
-- (KBDelayedPopUpButtonCell *)popupCell
-{
-	return [(KBDelayedPopUpButton *)[self view] cell];
-}
-
-- (void)setMenu:(NSMenu *)menu
-{
-	[[self popupCell] setMenu:menu];
-	
-	// Also set menu form representation - this is used in the toolbar overflow menu but also, more importantly, to display
-	// a menu in text-only mode.
-	NSMenuItem *menuFormRep = [[NSMenuItem alloc] initWithTitle:[self label] action:nil keyEquivalent:@""];
-	[menuFormRep setSubmenu:menu];
-	[self setMenuFormRepresentation:menuFormRep];
-	[menuFormRep release];
-}
-
-- (NSMenu *)menu
-{
-	return [[self popupCell] menu];
-}
-
-- (void)setAction:(SEL)aSelector
-{
-	[[self popupCell] setAction:aSelector];
-}
-
-- (SEL)action
-{
-	return [[self popupCell] action];
-}
-
-- (void)setTarget:(id)anObject
-{
-	[[self popupCell] setTarget:anObject];
-}
-
-- (id)target
-{
-	return [[self popupCell] target];
-}
-
-- (void)setImage:(NSImage *)anImage
-{
-	[regularImage autorelease];
-	[smallImage autorelease];
-	
-	regularImage = [anImage retain];
-	smallImage = [anImage copy];
-	[smallImage setScalesWhenResized:YES];
-	[smallImage setSize:NSMakeSize(24,24)];
-
-	if ([[self toolbar] sizeMode] == NSToolbarSizeModeSmall) anImage = smallImage;
-	
-	[[self popupCell] setImage:anImage];
-}
-
-- (NSImage *)image
-{
-	return [[self popupCell] image];
-}
-
-- (void)setToolTip:(NSString *)theToolTip
-{
-	[[self view] setToolTip:theToolTip];
-}
-
-- (NSString *)toolTip
-{
-	return [[self view] toolTip];
-}
-
-- (void)validate
-{
-	// First, make sure the toolbar image size fits the toolbar size mode; there must be a better place to do this!
-	NSToolbarSizeMode sizeMode = [[self toolbar] sizeMode];
-	float imgWidth = [[self image] size].width;
-	
-	if (sizeMode == NSToolbarSizeModeSmall && imgWidth != 24)
-	{
-		[[self popupCell] setImage:smallImage];
-	}
-	else if (sizeMode == NSToolbarSizeModeRegular && imgWidth == 24)
-	{
-		[[self popupCell] setImage:regularImage];
-	}
-	
-	if ([[self toolbar] delegate])
-	{
-		BOOL enabled = YES;
-		
-		if ([[[self toolbar] delegate] respondsToSelector:@selector(validateToolbarItem:)])
-			enabled = [[[self toolbar] delegate] validateToolbarItem:self];
-		
-		else if ([[[self toolbar] delegate] respondsToSelector:@selector(validateUserInterfaceItem:)])
-			enabled = [[[self toolbar] delegate] validateUserInterfaceItem:self];
-		
-		[self setEnabled:enabled];
-	}
-	
-	else if ([self action])
-	{
-		if (![self target])
-			[self setEnabled:[[[[self view] window] firstResponder] respondsToSelector:[self action]]];
-		
-		else
-			[self setEnabled:[[self target] respondsToSelector:[self action]]];
-	}
-	
-	else
-		[super validate];
-}
-
-@end