Simplify base code

Remove unessecary properties