code cleanup
add remove function