removing shit we don't need
finalizing the functionality