Created remove functionality and some client tweaks.