Cleaned up legacy code. Made sure to test for a few added methods