cleaned up debugging and old code