development: removed some code for simplification