Cleaned up some redundant methods