cleanup and added remove alias`