Cleaned up console and removed search