Fix Key Builder issues !!!!!

Key building is now done by the facade itself

+Clean Up