Code clean, remove everything unnecessary