Cleaned up methods I added and never used