remove unused modules
fix variable position