cleaned up unused methods