Feature cleanup

Cleanup several things in the project.