removed leftovers from original project, unified app code