Adding remove method
Ignoring tmp
code cleanup