Removed sloppy code