Initial Cleanup

End of Day Cleanup work