Refactored unneeded functionality