Removed old crapy