Remove un-needed parts so this build faster