Removed layers

They adds unncessary complexity. Trying to make something simple