Removing department from API
Code cleanup