removed test constructor, some cleanup