Added remove functionality for all shapes. Just right click on it :)