Cleaned up unnessary code