Code cleanup
Reverted back to Poss-Engine 1.0