Cleaned up Code

Removed unnecesary cacheing