Remove unnecessary stuff in code