Further cleanup and added a few empty classes