Reverted back to a simple state

removed all failing parts rebuilding