Finish functionality and remove dummies