clean up
made module server-independent
removed testing model/handler