Cleaned shit up!
Added new remove functioality.